bitkeeper revision 1.1353 (42679008eE6ft7E62R0UneGs51hd-w)

Enable grant table suspend and resume when CONFIG_XEN_BLKDEV_GRANT
is defined.

Signed-off-by: Bin Ren <bin.ren@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c
index 31b33671d5dbbae2742c94b507c0dffb23c5a7da..64616102010e4e37650a11c3ed959a1137c529c1 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c
@@ -77,15 +77,19 @@ static void __do_suspend(void)
 #define netif_resume()  do{}while(0)
 #endif
 
-
 #ifdef CONFIG_XEN_USB_FRONTEND
     extern void usbif_resume();
 #else
 #define usbif_resume() do{}while(0)
 #endif
 
+#ifdef CONFIG_XEN_BLKDEV_GRANT
     extern int gnttab_suspend(void);
     extern int gnttab_resume(void);
+#else
+#define gnttab_suspend() do{}while(0)
+#define gnttab_resume()  do{}while(0)
+#endif
 
     extern void time_suspend(void);
     extern void time_resume(void);